-
Notifications
You must be signed in to change notification settings - Fork 583
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
JUnit 4 -> 5 #5899
JUnit 4 -> 5 #5899
Conversation
f31ecf0
to
6939d6a
Compare
Only one remaining test remains |
Step 1. Make sure to remove the version from the docker compose. It is no longer needed and causes older versions of docker to fail Step 2. Update compose files to use the latest version of SCDF 3.x instead of 2.11.x Step 3. Update build image script so that uses java 17 when creating containers Update the DataFlowIT and the Abstract classes it is built on so that multipleComposedTaskWithArguments test passes. Notice that JobParameterJacksonDeserializer and JobParametersJacksonMixIn have been updated. These changes mirror those in spring-cloud#5850. These were required for the test to pass. At the time this PR is merged we can merge accepting those from spring-cloud#5850. Provide docs on how SCDF images are created and pushed Also update the DEFAULT_JDK to Java 17 Update PR based on code review comments * Added log message in case a JobParameter Type is invalid * cleaned up workflow.adoc
0aafc8c
to
59cee87
Compare
with: | ||
maven-version: 3.8.8 | ||
maven-mirror: 'https://dlcdn.apache.org/maven/maven-3/' | ||
# secrets not available to PR. | ||
# - name: Login dockerhub | ||
# if: ${{ secrets.DOCKERHUB_USERNAME != null && secrets.DOCKERHUB_USERNAME != '' }} | ||
# uses: docker/login-action@v3 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we remove this commented out code?
@@ -717,6 +717,7 @@ void pagination() throws Exception { | |||
} | |||
|
|||
@Test | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is an artifact. But we can probably remove these blank lines between the @test and the function.
All JUnit 5 changes are part of main-3 -> main merge PR |
Update all module except spring-cloud-dataflow-common-test-docker to JUnit 5.
Converted JUnit Asserts to AssertJ
Remove all Hamcrest matchers except those required by mockMvc assertions. Disabled failing tests for further investigation.
Resolves #5914